Removed unused files + fixes to make it runnable