reworked structure, added main bundle