add a compile time option to use mount points from user home directory + code refactoring