Moved some files for better structure.