clean-up imports
renamed Build file