Reworked api stuff
renamed files and cleanup
Stuff