Refactor
Move files to packages