Moved everything to one file
Commented