Added namespaces to decorators and changed file and directory names.