Restructured folders, broke common assets into shared folder