Restructured modules & added test module