Added proper library structure