Added gradle to manage dependencies
Optimising imports and arranging identation