Moved core module back into main package. Worked on disconnecting properly.