Cleaned up project from old files. Resloved various compiler-errors (WIP)