Organized all stuff in a more structured way