Finished module framework and cleaned up