Reorg src folders/files to be cleaner, clean up some copy tasks