now using a regular package layout - refactoring will continue there