some changes to the dir strucuture