Reorganize src directory