Project restructuring, several Improvement + fixes