Performed some restructuring
Updated .gitignore