flattened the project packaging a bit to make it more easily manageable