[Issue #27] Handle non-absolute paths when scanning
Clean up access modifiers and add decorators