Completely changed project architecture. Not ok with the previous
architecture