Project restructure. For the better