Structure changes, added requirements file