deleted and renamed some files to simplify the structure
renamed classes and namespace according to the new structure