UPDATED file structure and FIXED some layout issues