refactored dirs, fixed links