updated to cleaner folder structure