Architecure modifications, improvements, fixes & Project splitting