First Commit, added a part of the base for the restructuration.