rearranged libraries and includes directories