went back to normal code folder structure