Further repository restructuring

trying my hardest not to copy code anymore