Some files separation.
Moved some initial checks to master.