Restructure project a little bit & more