Deleted and cleaned up some codes. 
Added new files and codes to make integration easier