Design improvements, directory re-structured