Cleaned up file names, added docs