Changed folder structure logic

We changed the folder structure logic moving all the logic API one
folder up to be on the root folder