Organizing stuff

Signed-off-by: Simarpreet Singh <simar@linux.com>