Fix documenation and file structure