follow more consistent folder structure