restructured directories and added back package declarations