Directory structure fix

Some source files were misplaced