starting to change folder structure and cleanup