Updating the Repository structure

A major rework is planned. This is a first step to clean the repository
a little.