Removed base dir from everything