Added modal & restructured folders