Reorganize structure

Moved files into corresponding subfolders