Moved some files. Build also compiles properly now.