Changed source folders
Tidying