Changed the Structure and added programs