Refactored the source path to behave more nicely