Restructure filesystem layout for better package encapsulation: