Restructured code branch and added new files