Formatting, cleanup and added necessary files to make it fully working