Removing unused file
Adding packages for each executable and namespacing things