Reorganized and cleaned up source directories