Rethink the filestructure