Fix messed src and lib directories