restructuring folders and cleanups