Cleaning up code
Rearraning code and Ignoreing generated files