Folders restructured and some unnecessary files removed