Partially Fixed Code. Moved some methods around.
Fixed auto-tools files
Initial Merge
Initial commit