Moved files to work better with Eclipse.