Cleaned up and separated files