folder strucuture fixes
reorganize this thing