Orgamanizing the code