Moved files for include to seperate folder and updated main files