moving stuff around
updated for new system
work on VCS specific aliases