Refactor file structure. Organize package structure