Moved some sources into subfolders