Moved base spell, also added @API classes
Did some formatting