Reorganized structure.
Updated .gitignore