Remove trailing whitespaces
Change project structure