Some improvments in project architecture