fixed package/file structure