Improved file structure, added clean make rule, fixed some errors