Fix Rakefile
Move Structure to Entity