Reorganization

Just to make it more clear, as i target noob users.