Reorganize src into subfolder