Modularize project
Removed unused file
Addition of parent possibility for tracing
Rename variable for clarity