Moved some file to reflect new package structure