Restructed, added build file and removed debug messaegs