Put some organization in my project