Code refactor: change some source files location