Reorganized filesystem and changed to C# Properties