cleaning up code
moved api folder
cleaning up more code