moved packages out into main folder