Simplified project layout and adjusted all corresponding files.