Refactor: removing top level src dir