Cleaned up unused folder and fixed some pathing issues