Cleaned up directorys and main file runs