Rearranged folder structure
Clean up
Clean up /2