New Interface + cleaned project structure