Folder structure cleanup

A simple cleanup of the folder structure inside of the respository