updated/fixed object stack & implemented new file structure/route part2