Removed tests and changed directory structure