Cleanup and restructure repository