Complete refactoring of project structure

Signed-off-by: Alex <alex.lehn@googlemail.com>