Moved to org.jetbrains.spek package and cleaned up old files/code