Organizing the code..