cleaning up packaging and file layout