Cleaned up file names; Initial build