Moved directories and path names to static templates / Added remove command