Removed Test, added code structure