springs and fans
unmerged files
changed modifiers on all objects and moved classes into their respective packages