Changed: folder structure, refactored index file