some reorganization

also started on a new project :)