develop: clean and moving files to a new structure, set a new name, fix minor bugs