make it more modern directory structure