Cleaned up the directory and edited functionality.